From 57356cfe07da20db5d6c2877fd1b19c72d00c494 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Wed, 29 Nov 2000 12:52:41 +0000 Subject: [PATCH] If there is a grab, but no grab-cursor, use the cursor from the grabbed 2000-11-29 Alexander Larsson * gdk/linux-fb/gdkinput-ps2.c (move_pointer): If there is a grab, but no grab-cursor, use the cursor from the grabbed window. (gdk_fb_window_send_crossing_events): Send normal enter/leave notifications if grab and owner_events == TRUE. --- ChangeLog | 7 +++++++ ChangeLog.pre-2-0 | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-2 | 7 +++++++ ChangeLog.pre-2-4 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ gdk/linux-fb/gdkinput-ps2.c | 16 +++++++++++++--- 8 files changed, 62 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 39f6ec16d6..e52ac1b44c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2000-11-29 Alexander Larsson + + * gdk/linux-fb/gdkinput-ps2.c (move_pointer): If there is + a grab, but no grab-cursor, use the cursor from the grabbed + window. (gdk_fb_window_send_crossing_events): Send normal + enter/leave notifications if grab and owner_events == TRUE. + 2000-11-29 Alexander Larsson * gdk/linux-fb/gdkinput-ps2.c (send_button_event): diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 39f6ec16d6..e52ac1b44c 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,10 @@ +2000-11-29 Alexander Larsson + + * gdk/linux-fb/gdkinput-ps2.c (move_pointer): If there is + a grab, but no grab-cursor, use the cursor from the grabbed + window. (gdk_fb_window_send_crossing_events): Send normal + enter/leave notifications if grab and owner_events == TRUE. + 2000-11-29 Alexander Larsson * gdk/linux-fb/gdkinput-ps2.c (send_button_event): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 39f6ec16d6..e52ac1b44c 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +2000-11-29 Alexander Larsson + + * gdk/linux-fb/gdkinput-ps2.c (move_pointer): If there is + a grab, but no grab-cursor, use the cursor from the grabbed + window. (gdk_fb_window_send_crossing_events): Send normal + enter/leave notifications if grab and owner_events == TRUE. + 2000-11-29 Alexander Larsson * gdk/linux-fb/gdkinput-ps2.c (send_button_event): diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 39f6ec16d6..e52ac1b44c 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +2000-11-29 Alexander Larsson + + * gdk/linux-fb/gdkinput-ps2.c (move_pointer): If there is + a grab, but no grab-cursor, use the cursor from the grabbed + window. (gdk_fb_window_send_crossing_events): Send normal + enter/leave notifications if grab and owner_events == TRUE. + 2000-11-29 Alexander Larsson * gdk/linux-fb/gdkinput-ps2.c (send_button_event): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 39f6ec16d6..e52ac1b44c 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +2000-11-29 Alexander Larsson + + * gdk/linux-fb/gdkinput-ps2.c (move_pointer): If there is + a grab, but no grab-cursor, use the cursor from the grabbed + window. (gdk_fb_window_send_crossing_events): Send normal + enter/leave notifications if grab and owner_events == TRUE. + 2000-11-29 Alexander Larsson * gdk/linux-fb/gdkinput-ps2.c (send_button_event): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 39f6ec16d6..e52ac1b44c 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +2000-11-29 Alexander Larsson + + * gdk/linux-fb/gdkinput-ps2.c (move_pointer): If there is + a grab, but no grab-cursor, use the cursor from the grabbed + window. (gdk_fb_window_send_crossing_events): Send normal + enter/leave notifications if grab and owner_events == TRUE. + 2000-11-29 Alexander Larsson * gdk/linux-fb/gdkinput-ps2.c (send_button_event): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 39f6ec16d6..e52ac1b44c 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +2000-11-29 Alexander Larsson + + * gdk/linux-fb/gdkinput-ps2.c (move_pointer): If there is + a grab, but no grab-cursor, use the cursor from the grabbed + window. (gdk_fb_window_send_crossing_events): Send normal + enter/leave notifications if grab and owner_events == TRUE. + 2000-11-29 Alexander Larsson * gdk/linux-fb/gdkinput-ps2.c (send_button_event): diff --git a/gdk/linux-fb/gdkinput-ps2.c b/gdk/linux-fb/gdkinput-ps2.c index 420b8645fc..d6119ee5b5 100644 --- a/gdk/linux-fb/gdkinput-ps2.c +++ b/gdk/linux-fb/gdkinput-ps2.c @@ -388,8 +388,18 @@ move_pointer (MouseDevice *mouse, GdkWindow *in_window) gdk_fb_cursor_hide (); - if (_gdk_fb_pointer_grab_window && _gdk_fb_pointer_grab_cursor) - the_cursor = _gdk_fb_pointer_grab_cursor; + if (_gdk_fb_pointer_grab_window) + { + if (_gdk_fb_pointer_grab_cursor) + the_cursor = _gdk_fb_pointer_grab_cursor; + else + { + GdkWindow *win = _gdk_fb_pointer_grab_window; + while (!GDK_WINDOW_IMPL_FBDATA (win)->cursor && GDK_WINDOW_OBJECT (win)->parent) + win = (GdkWindow *)GDK_WINDOW_OBJECT (win)->parent; + the_cursor = GDK_WINDOW_IMPL_FBDATA (win)->cursor; + } + } else { while (!GDK_WINDOW_IMPL_FBDATA (in_window)->cursor && GDK_WINDOW_P (in_window)->parent) @@ -444,7 +454,7 @@ gdk_fb_window_send_crossing_events (GdkWindow *dest, /* When grab in progress only send normal crossing events about * the grabbed window. */ - only_grabbed_window = (_gdk_fb_pointer_grab_window != NULL) && + only_grabbed_window = (_gdk_fb_pointer_grab_window_events != NULL) && (mode == GDK_CROSSING_NORMAL); if (a==b) -- 2.30.2